integral/models.py

@@ -115,6 +115,7 @@ class SaleclerkSubmitLogInfo(BaseModelMixin):

                     is_wxwork = models.BooleanField(_(u'is_wxwork'), default=False, help_text=_(u'是否为企业微信端'), db_index=True)
              

                 
              

                     is_staff_delete = models.BooleanField(_(u'is_staff_delete'), default=False, help_text=_(u'是否管理员删除'), db_index=True)
              

                +    code_version = models.IntegerField(_(u'code_version'), default=1, help_text=_(u'是否新码'), db_index=True)
              

                 
              

                     class Meta:
              

                         verbose_name = _(u'销售员扫码出库记录')
              

logs/models.py

@@ -18,6 +18,9 @@ class MchInfoEncryptLogInfo(BaseModelMixin):

                 
              

                     sn = models.CharField(_(u'sn'), max_length=32, blank=True, null=True, help_text=u'序列号', db_index=True)
              

                 
              

                +    #二维码版本
              

                +    version=models.IntegerField(_(u'version'), default=2, help_text=u'二维码版本', db_index=True)
              

                +
              

                     # 一物一码
              

                     application_id = models.IntegerField(_(u'application_id'), default=0, help_text=u'申请单号', db_index=True)
              

                     code = models.CharField(_(u'code'), max_length=16, blank=True, null=True, help_text=u'九位的字符串原始码', db_index=True)
              

page/sale_views.py

@@ -17,6 +17,8 @@ from statistic.models import (DistributorSaleStatisticInfo, ModelSaleStatisticIn

                                               SaleclerkSaleStatisticInfo, SaleStatisticInfo)
              

                 from utils.error.errno_utils import (ProductBrandStatusCode, ProductDistributorStatusCode, ProductMachineStatusCode,
              

                                                      ProductModelStatusCode, SaleclerkStatusCode)
              

                +import os,sys,string
              

                +
              

                 
              

                 
              

                 @logit
              
@@ -99,6 +101,14 @@ def clerk_sale_submit_api(request):

                     # 是否被消费者扫过
              

                     has_scan = ConsumeInfoSubmitLogInfo.objects.filter(model_id=model.model_id, serialNo=serialNo).exists()
              

                 
              

                +    #是否是新二维码，即统览码2
              

                +    code_version = 1
              

                +    code = filter(lambda ch: ch in '0123456789', serialNo)
              

                +    encrypt_logs = MchInfoEncryptLogInfo.objects.filter(model_id=model.pk, sn=code)
              

                +
              

                +    if encrypt_logs:
              

                +        code_version = encrypt_logs[0].version        
              

                +
              

                     # 店员提交记录
              

                     ssli = SaleclerkSubmitLogInfo.objects.create(
              

                         brand_pk=brand.pk,
              
@@ -123,6 +133,7 @@ def clerk_sale_submit_api(request):

                         has_scan=has_scan,
              

                         trackingNo=trackingNo,
              

                         is_wxwork=is_wxwork,
              

                +        code_version=code_version,
              

                     )
              

                 
              

                     if test_sn: